Merge from mainline.
authorKatsumi Yamaoka <katsumi@flagship2>
Sun, 13 Jun 2010 09:38:33 +0000 (09:38 +0000)
committerKatsumi Yamaoka <katsumi@flagship2>
Sun, 13 Jun 2010 09:38:33 +0000 (09:38 +0000)

Trivial merge